[trunk] Import applications modifications from 1.5 over to trunk