Remerging to normal compile process. Finalizing before merge to master